Fix collect changes.
Merge branch 'master' into rename-detection