sync 2.5.x