Update to regex expression format pattern matching. Fixes #2637