Merge branch 'hotfix/correction_regex' into develop