Merge pull request #4878 from pratikshad/broken-webtest