wip/re2/patches
