Cross-merge MAGN-5442 to RC0.7.4