Merge branch 'mr889-backport' into 'develop'

Backport MR !889, unify settings between distros and improves

See merge request !1609
1 job for develop in 12 seconds (queued for 2 seconds)