Merge branch 'feature/init-cleanup'