Merge "Stack tool 32/64 bit compatibility fixes."