Skip to content

Backport !562 to server-1.20-branch

Matt Turner requested to merge mattst88/xserver:backport-562 into server-1.20-branch

Just cherry-picks the patches from !562 (merged) to the 1.20 branch.

Merge request reports