Merge pull request #4099 from atif-shaikh/CRM-15240