am 2b2529f2: Merge "fix some bugs in SharedBufferStack::resize" into kraken