Squashed 'wp/' changes from 8422210..9b5c15e


git-subtree-dir: wp
git-subtree-split: 9b5c15ec5d647663d787bd3d6aebb7f48f4fa82c
Merge commit 'fd737466bb0b0609f1b3834bc7cf5849435c942e'