Merge branch 'jk/validate-headref-fix'