merge tag upstream/1.38