Merge pull request #15305 from yashodha/CRM_21777