Merge "Remove feature flag"