Merge tag 'v2.5' into mer-master