V2.5rc.3

@davehunt or @andreeamatei can you have a quick check?