This will need to be dropped, and then I'll review this PR to see if it will fit in with the next release.