2i term regex filter 1.4

Backport the 2i term regex filter to the 1.4 series