Fix data overflow
Merge branch '3.8'