Merge pull request #1382 from swati-karande/CRM-13146