Merge branch 'kh/update-ref'