Merge "Fix potential divide by zero"