Merge remote-tracking branch 'ivan/bug/4491_remove-failing-regex' into develop