Merge branch 'jk/rebase-config-insn-fmt-docfix' into maint