ENG-4236 addressed code review comments