Oh, so you merged #4290 already? :D