Merge branch 'pb/am-show-current-patch'