TS-1459: Backport regex_remap
7 files changed