Merge branch: cuckoo-clean