Merge "Add feature flag for condition manager refactoring"