Merge pull request #3205 from jitendrapurohit/WebFix_4.5