Squashed 'wp/' changes from d101cb3..47520b3


git-subtree-dir: wp
git-subtree-split: 47520b3fb40c5605c3436fb69de3c8e3c297d5ca
Merge commit 'f60b01023e5cdd222843d5ec39d6fce97c68deb9'