Merge branch 'jn/maint-test-return'