ENG-4561 addressed Andrew G comments