v2.5.0

#### Summary:

After this merge, this should be tagged as v2.5.0.

#### Side Effects:

None. Just doc.