ENG-6390 Addressing all the comments