Merge "Skip zaqar-requiring tests properly" into mcp/stein