Merge 3.4.39 upstream