Merge tags from 2.5.