Merge branch 'jc/branch-name-sanity'