Fixed in both core-8-5-branch and trunk. Thanks for the report!