[upstream] Text updates