Fix Type
Merge branch 'master' into course_placeholder