Fixed in core-8-5-branch [8aefc70fdb] and trunk [818d7d0f1a]