Merge branch 'feature/multi-clean'