Merge branch 'jc/branch-d'