MDL-28183 fix for problem during integration