Merge pull request #8346 from dyn888/dyn888-regex-1