Merge branch 'daniel/project-mentors'