Merge pull request #7981 from rohankatkar/CRM-18183