am 8d58c957: Merge "Free allocated struct after freeing field"

* commit '8d58c957036835db148acc4e506633a016dc6c7e':
  Free allocated struct after freeing field