Merge branch 'np/lookup-object-hashing'