Merge "config: enable feature flags"