FRU: Sync with upstream