Merge branch '487-courses' into 497-add-course-id-prop