Merge branch 'db/clone-in-c' into next