Merge "Remove legacy flag from framework" into main