Fixed in core-8-5-branch [b91497ebb7] and trunk [320dbce662]