Sync with v1.4.9.0