Merge pull request #6232 from sudhabisht/WebtestFix1