ENG-4819 ENG-5102 Addressed Ariel's code review comments