Fix for CRM-15420
Merge pull request #4355 from rohankatkar/CRM-15420

Fix for CRM-15420