am daf63839: Merge "Keep pointers to extension values."

* commit 'daf638399bd42122306786e8062f392ddace4363':
  Keep pointers to extension values.