Merge branch 'jl/maint-fix-test'