Merge pull request #4180 from atif-shaikh/WebtestFix