Merge branch 'dl/t0000-skip-test-test'