Health in battle as well
Merge remote-tracking branch 'origin/lockhart'