Merge pull request #1729 from pratik-joshi/CRM-13479