Merge branch 'jc/skip-test-in-the-middle' into maint