ENG-2549 added comments re: review by jhugg.