Ok, I'll rebase my patchset on top of your PR when it gets merged.