For ENG-4963, address Steve's and Stefano's reviews