DDF-341 fixed merge issue