Merge "Fix writing transfer ownership bundle"