Merge "DO NOT MERGE Fix divide by zero" into lmp-mr1-dev