Bug 19463: Additional changes to gen_text