1116 diagnostics

Merged development.  Fixes #1116