ENG-7424 Address review concerns.