Merge branch 'jk/hashcmp-memcmp' into maint