Merge pull request #10964 from yashodha/CRM-21169