OP-1622 Changes discussed in review