Merge branch 'nd/maint-remote-remove' into maint