Cross-merge MAGN-5413, 5414