Merge branch 'master' into 'minimizer_tweaks'

Master

See merge request !186
4 jobs for minimizer_tweaks in 17 minutes and 43 seconds (queued for 1 second)