Merge branch 'fc/show-branch-in-rebase-am'