fix for health calculations
Merge remote-tracking branch 'origin/layout' into layout-cs
fix for health calculations
Merge remote-tracking branch 'origin/layout' into layout-cs