ref: refs/heads/SS-1956-wordpress-plugin-fixes
