Merge branch 'hashable-instances' into development