WIP health check work from other branch
adding generate changes from HC branch
wip
Merge remote-tracking branch 'origin/master' into healthcheck