Merge "Fix OOM throwing if it happens in finalizer reference (take 2)"