Merge pull request #5376 from atif-shaikh/CRM-16105