Merge "Fix divide by zero" into lmp-dev