make failed web service pass
Merge remote-tracking branch 'origin/master'