Merge pull request #5216 from atif-shaikh/CRM-15792