OP-1660 Changes from review