Merge "A few more conversions from 32-bit to 64-bit RD calculations." into experimental