Merge "Fix damage bug" into lmp-mr1-dev