ENG-6438 addressed code review comments