fixed in all branches now (since [4af9ff473e] for 8.5th), thus close.