Merge "Make hidden stack tag configurable"