Merge pull request #2928 from jitendrapurohit/Activity_webtest