Merge branch 'master' into normalize_descent

4 jobs for normalize_descent in 63 minutes and 24 seconds (queued for 13 minutes and 4 seconds)