Code

Merge branch 'nd/maint-verify-objects'