Sync with -common tree again