Merge pull request #5542 from atif-shaikh/WebtestFix