Code

Merge branch 'bk/ancestry-path' into jc/branch-desc