Merge pull request #4708 from jitendrapurohit/CRM-15662