Merge pull request #1780 from pratik-joshi/CRM-13568