Various cherry-picks for 1.20.4

Merged Adam Jackson requested to merge ajax/xserver:server-1.20-branch into server-1.20-branch

Merge request reports