Cleanup: Releases 2.5

Marian Piatkowskirequested to merge
cleanup/releases-2.5 into master

My old cleanup branch related to the 2.5 release.

Merge request reports