Pick up some changes from text helper

refs 6ce4746474ddf050f7f4df61b7a22b7f5854d533
1 file changed