Fixed in core-8-5-branch [4c14f88702] and trunk [04b08d7303]