improvements to health check
Merge branch 'develop'