Merge branch 'jc/test-prereq' into maint