Merge pull request #4550 from jitendrapurohit/CRM-15568