This cleans up the feature flag code. Changelog: added
Attach a file by drag & drop or click to upload