Merge branch 'cb/rebase-am-exit-code' into maint