Merge more test vs hashing-order fixes from 3.2.