diagnostics updates for May 8 release