Merge branch 'mh/object-code-cleanup'