Updated regexp
Merge branch 'BUG_4313_Track_Regexp'