Merge "Add a feature flag for controller loading enhancement"