MDL-52210 upgrade: dan sucks at integrating