Merge pull request #6698 from jitendrapurohit/CRM-17169