Merge pull request #8193 from colemanw/scardinius-issue-CRM-16911