Merge remote-tracking branch 'origin/feat/developer/10389-bad-regex-no-biscuit' into feat/developer/10389-more-regex-test