Merge "Make hidden stack tag configurable" into mcp/queens