am bc7f8a79: Merge "Do not keep struct state on the stack."

* commit 'bc7f8a791b4a510914fd5cac713415acb80fb806':
  Do not keep struct state on the stack.