Sync with 1.4 branch