WIKI-125 fix merge