Merge pull request #2918 from atif-shaikh/WebTextFix