Merged branch wip-MDL-30521 with conflict resolutions