Merge "fix tag regexp to match quoted groups correctly" into main