Sync with sdb-git