Backport MR !889, unify settings between distros and improves

1 job for !1609 with mr889-backport in 7 minutes and 1 second (queued for 1 second)
latest merge request