Merge pull request #8745 from twomice/CRM-19120