Merge pull request #7281 from mlutfy/4.7-crm13934