Merge branch 'pw/rebase-i-merge-segv-fix'