don't use overlays for hashes
Merge branch 'master' into next