sync with v3.2.15