Merge branch 'du/branch-show-current'