Merge branch 'sv/objfixes' into maint