sync with 3.4 branch
1 file changed