Thanks for the heads-up. I'll avoid basing pull-requests on top of pull-requests, but as soon as #3959 gets merged I'll merge accordingly.