PR: 227509 Requested by: Johannes Lundberg, Greg V Reviewed by: tobik (earlier version) Approved by: madpilot, x11 (zeising), maintainer timeout (2 weeks) Exp-run by: antoine