Merge pull request #1304 from aadityawalawalkar/CRM-12439