Merge branch 'jk/use-our-regexp'