Merge branch 'sr/clone-empty'