Merged to core-8-5-branch, core-8-6-branch and trunk.

Thanks again, Keith!!