Merge "Add flag migrate_clocks_to_blueprint" into main