For ENG-4796, make several modifications based on Ariel's feedback