Merge "Add new FeatureFlagsClassic alias" into main