Merge branch 'sb/maint-octopus' into maint