ENG-5027 Address most review comments.