Account for existing _
field pattern when suggesting ..
#81422
Merged
_
field pattern when suggesting ..
#81422