Merge branch 'ks/fix-rebase-doc-picture' into maint