CRM-14379
Merge pull request #2810 from pratik-joshi/crm-14379-fix

CRM-14379