Merge branch 'jc/branch-description-unset'