Merge "Fix overflow in PCR calculations" into nyc-dev