Additional changes for CRM-15120
Merge pull request #4236 from rohankatkar/CRM--15120

Additional changes for CRM-15120