Sync with vanilla-6.30 (a)