am a9aa6baa: Merge "Set u.ext_data to null after it has been freed"

* commit 'a9aa6baa5d86fc1a5bd37fc636d766d9e3ad2507':
  Set u.ext_data to null after it has been freed