For ENG-6031, add the comments Izzy asked for