Merge branch 'jc/symref'