Merge branch 'nd/add-empty-fix' into maint