Merge branch 'feature/di-compiler' into develop