Merge branch 'bw/rebase-i-ignored-submodule-fix' into maint