Merge branch 'jn/maint-setup-fix'