Merge "Add featureFlag attribute for new permissions" into main