Merge branch 'testsuite-work' into master