Merge pull request #1656 from alexanderkyte/webservice_27561