Sure, thanks. Let's merge this now, then I'll ping you when gh-2510 gets merged.