Unfortunately this will clash with #3477. I'll try to fix it soon but you'll have to rebase.