Merge pull request #7252 from jitendrapurohit/CRM-17507