For ENG-6244, incorporate Stefano's feedback