Merge pull request #3400 from vpisarev:fixed_umat_test_crash