- Merge branch '64bitIn32Bit'
- Cherry picked from branch '64bitIn32Bit'