Merge branch 'jk/branch-verbose-merged'