For ENG-6546, address review comments