Backported changes from a66aae630e54024a5e6a3b3db4f6f5806e353e9e to Health plugin
Backported the fix described in 240bff618acd1120c396a4012fcf9002b11065bc to the Health plugin