Merged the regex changes
Merged the regex changes