Sync with 4.3.0