Fix test
Merge branch 'master' into copy-from