Merge remote branch 'amitay/tdb-sync'