Done now in 3945649 - untested. Will do on Friday.