Merge pull request #11296 from jmcclelland/CRM-21449