Merge pull request #3558 from atif-shaikh/CRM-14782-fix