Merge pull request #10456 from elisseck/CRM-20672