ENG-6390 addressing Walter's comments