Merge branch 'nd/maint-sparse-errors'