Fixed in core-8-5-branch and trunk

Thanks!