Merge pull request #7216 from jitendrapurohit/CRM-17504