OP-963 fixed bad merge