ENG-7978 added comments