Merge branch 'bc/hash-transition-part-15'