Diagnostics updates
Merge pull request #1175 from rwike77/diagworking

Diagnostics updates for 4/25