Merge pull request #4638 from jitendrapurohit/CRM-13456