ENG-4524b Fix and improve multi-COW diagnostics