WIP: Issue243 - Fixes for zz-mass-hosting

Closed Paul Cammish requested to merge issue243 into buster-testing
Edited by Paul Cammish