Merge "Integrate integer overflow changes from security branch" into nyc-dev