sync with 3.4.0