Merge branch '1868_replace_regexp_hangup' into 4.8.1-stable