Merge pull request #5591 from jitendrapurohit/CRM-15735