Merge branch 'sb/maint-octopus' into maint-1.6.5