Code

Merge branch 'jc/maint-verify-objects-remove-pessimism' into maint-1.7.8