1.20 backport of !356

Merged Michel Dänzer requested to merge daenzer/xserver:server-1.20-branch into server-1.20-branch

Merge request reports