Merge pull request #11881 from yashodha/CRM-21854