Fixes for 1.20 branch

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

Cherry picks from master.

Merge request reports