do deeper checking for __health__
Merge remote-tracking branch 'upstream/master'