PR: 47493 Submitted by: Ports Fury Additional regex fixes by Simon Schubert <corecode@corecode.ath.cx>.