Merge "Switch stacks when the current stack has limited service" into main