OP-1026 fix review issues