Merge pull request #4651 from jitendrapurohit/CRM-15559