Merge branch 'ab/grep-pcre2-allocfix'