Merge pull request #3434 from Karlson2k/regexp_rework_02