Merge branch 'hashtables'