Merge branch 'clone-detection' into working