CRM-14036_fix
Merge pull request #2294 from pratik-joshi/CRM-14036_fix

CRM-14036_fix