Merge "Clarify ownership of returned pointer"