Clean up missing commits

Merged Paul Cammish requested to merge buster into buster-testing

Merge request reports