regex based fix, unit tests

Closes #3432948

Merge request reports

Loading