Final Merge

Henning Linrequested to merge
Server into main

Updated Server Branch with the complete implementation to Main.

Merge request reports