OP-5810 - Review comment changes.