Merge "Update flag check to MigrateClocksToBlueprint" into main