Added the host and VM sysdiagnose debug to FB24608345. Was hoping to try the next beta, but that didn't appear on Monday so used 26A5425a. Would be great if this can be fixed before GA.