-Improved (simplified) regular expression.
-[FIXED JENKINS-21657]: implicitly fixed with regex improvements.
-Use a static pattern instead of creating it every time.