Merge branch 'sv/objfixes'