[PRQ#59211] Merge Request for xorg-server-bug865-bug1578