Merge with upstream (Fix bug #67705 - extensive backtracking in rule regular expression)
Fix test cases