Revert "Revert "V2.5""

This reverts commit 36c75f3c99914aa890f6125682a6aeff2692b40c.