Merge branch 'jk/consistent-h'