merge 2.6 with hash randomization fix