Merge branch 'pb/regex' into next