Feature/926 health check enhancements

# Warning
# Info
# Issues
Fixes #926