Regex fix for config file scanning
Merge regex hotfix into customized branch.