Merge branch 'sh/use-hashcpy'