Fixed in core-8-5-branch [f6a2f50eb8] and trunk [0b5fb73910]