For ENG-4709, fixes based on Steve's feedback