Merge branch 'master' into fix_smoothing

4 jobs for fix_smoothing in 50 minutes and 31 seconds (queued for 32 seconds)