Cleanup/releases 2.5

Ghost Userrequested to merge
cleanup/releases-2.5 into master

Merge request reports