Merging dev to master for 2.8.10804.1442-rc