am be5e8f72: Merge "Stack tool 32/64 bit compatibility fixes."

* commit 'be5e8f728a7daa64049a20a61a65d83570f2448d':
  Stack tool 32/64 bit compatibility fixes.