Merge branch 'feature/init-errors' into develop