Merge branch 'feature/init_refactory' into develop