sync from v3.2