Fixed in core-8-5-branch [426679ef7d] and trunk [92ff51d4b5]