Sync with last revision of Duplex