Merge "Fix power namespace for feature flags." into main