Sync with 11ddae.