tag upstream/2.5.2