[PR-540] Add a new feature flag