Allow _ before numbers during candidate extraction
#17961
Merged
_ before numbers during candidate extraction
#17961