Merge branch 'jk/negative-hiderefs'