DDF-638 fixed bad merge