Merge branch 'tw-merge-master' into testsuite-work