Merge "Revert "Audit object lifetime management: Fix documentation, add tests, add defensive code""