Merge pull request #6711 from pradpnayak/CRM-16904