Merge remote-tracking branch 'origin/vertical_fixed'

3 jobs for master
in 36 seconds, using 0 compute credits, and was queued for 1 second