r8946: merge done except for changes in objects file