Merge branch 'mg/branch-list'