Merge "[DON'T BLOCK] Test ownership migration rules" into main