Minor changes for CRM-15434
Merge pull request #4349 from rohankatkar/CRM-15434

Changes for CRM-15434