Merge "Fix divide by zero" into sc-dev