GUI upgrades rebased

Albert Gräfrequested to merge
gui-upgrades-rebased into master

Cleaned up version of !510 (merged) (which see for description and discussion), rebased on current master, ready to be merged.

Merge request reports