Merge pull request #2862 from pratik-joshi/CRM-13973-comment