Great, thanks! I'll wait for #4369 to let you deal with the merge conflict since you're more experienced :)