Merge branch 'fix-ts-regexp0'