Migrate new code from merge to use OK standards