Merge branch 'nd/maint-verify-objects' into maint