diagnostics updates for May 8 release
Merge pull request #1263 from rwike77/diagworking

diagnostics updates for May 8 release