#JC-1111 fix merge