Stack update
Merge pull request #6254 from Kelenius/OfStacks

Of Stacks