Merged into core-8-6-branch and trunk.