commit cb24e263 Author: Herman van Rink <rink@initfour.nl> Date: Sat May 21 20:56:57 2022 +0200 Backport MR !889, unify settings between distros and improves