OP-1365 fix comments