Backport MR !889, unify settings between distros and improves

1 job for mr889-backport in 10 seconds (queued for 4 seconds)
latest