merged branch ba/course_validation