Merge pull request #4474 from jitendrapurohit/CRM-15538