Merge "Add feature flag, and support for new secure settings in framework" into main