Update FeatureFlags.php
Merge branch 'dev'