Cherry Picked health bar changes from Archie @ef898164272fd4b5e919c3ebdaa688470c6d9d46