Feature/gzi/server

beinhaltet ebenfalls die Commits aus "Feature/kgu/misc approvs tidyups".
??? Copypaste? :-)