Merge pull request #5529 from pradpnayak/CRM-13793