Merge branch 'rj/test-regex' into next