Merge branch 'dist-utils' into 'dev'

Dist-utils

See merge request !7
3 jobs for dev
in 4 minutes and 27 seconds and was queued for 6 seconds