ENG-4898 More review changes.