Merge branch 'bug/init'