Merge "Fixed a crash where the overflow number wasn't initialized" into nyc-dev