Merge pull request #2216 from monishdeb/CRM-13738-fix