Changes related to supporting rebinding objects between sessions.