cog

Symbolically merging healthcheck changes from v0.16.x series

#2759

Merged