Merge "Fix bug in validating Swift transaction ID"