Additional changes for CRM-15421
Merge pull request #4325 from rohankatkar/CRM_15421

Fix for CRM-15421