Merge branch 'nd/clone-case-smashing-warning'