Fix merge 3.8