Improve support for text siglen including underscore

Change-Id: I86204f2aae32834e1592335dca83f40cbf46f559
27 files changed