ENG-5112 review changes