CORE-4270: added feature flags