sync text rendering style between master and 2.3.x branch - refs #2326