Merge "[feat][core] manage SI feature flags"