Merge branch 'nd/maint-setup' into next