Merge branch 'bm/merge-base-octopus-dedup' into maint