Fix data hash portability (#8401)