Merge "fix a div by zero issue"