Merge pull request #5895 from jitendrapurohit/CRM-16551