Merge branch 'vm/octopus-merge-bases-simplify'