Merge pull request #4508 from Ansuel/wpscontrol