Fixed name parsing result issues with improper regex patterns being used.
Merge remote-tracking branch 'upstream/dev' into dev