fix incorrect merge
Merge branch '3.8/master' into 3.8/my