Sync with contributions to D.O.