Merge branch 'feature/issue-119-rewrite-learner-performance' into develop
Merge branch 'develop' into feature/issue-120-rewrite-teacher-performance