Merge "avoid 32-bit integer overflow" into oc-dev