[3.9] Fix merge 3.8