Merge branch 'bc/hash-independent-tests-part-6'