Merging dev to master for 2.7.10707.1513-rc