Merge pull request #3437 from pratik-joshi/CRM-11966