Port language update from master-1.2 that was not put into master.