Merge "Fix divide by zero" into nyc-dev