Added more diagnostics for developer's mode
Merge pull request #1009 from sjinks/mm

Diagnostics for developer mode