Merge "Revert MCR migration stage to write-both/read-old"