MDL-40903 fixed merge conflicts against integration