Merge branch 'jc/branch-contains'