Merge "Added support for static vs. dynamic stacks"