ENG-4524b Add diagnostics from ENG-4524.