Merge branch 'dp/hash-literally' into next