ENG-7392: review changes.