(cherry picked from commit 7c4eb71f07)
7c4eb71f07
Adds health check feature including some initial checks