CRM-14265
Merge pull request #2931 from pratik-joshi/CRM-14265-fix

CRM-14265