Merge pull request #6897 from jitendrapurohit/CRMtestfixes