Merge pull request #7786 from konadave/CRM-18017