Phase 7: Leftovers #8

Closed
krendelhoff wants to merge 2 commits from phase-7-client into master

2 commits