Merge branch 'jk/test-fixes' into maint