Merge commit 'rusty/tdb-update'