Sync with ports r371252