Merge branch 'jc/hidden-refs'