Merge branch 'clone-detection' into clone-detection-rpmas