Merge branch 'jc/branch-desc-typoavoidance' into next