This is fixed on trunk and core-8-5-branch now.