Wp to multi 3878

Fixes #3878

I don't think this warrants us waiting to merge the PR, though.