merge 3.8.6