Renamed feature flag per feedback from DB