Merge pull request #9777 from jitendrapurohit/CRM-19745fix