Okay. Should we merge now or would you like to let DN/TF/WW to take a look first?
(I just looked at style things and don't know if the functionality/tests actually make sense. But if you only moved code all of this has already been reviewed.)