Merge branch 'kb/maint-rebase-autosquash'