Sync with 3.4.4