Added more diagnostics
Merge branch 'develop'