Merge pull request #7402 from rohankatkar/webtestmaster_4.7