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

Thanks again for the report and even more for the patch!