Merge branch 'jk/rebase-i-submodule-conflict-only' into maint