Merge tag '2.5' into release