Sync with ports, rev 330369