Remove compilation warning
Merge branch '3.8'