fixup! Fix bad uses of course_id/location/locator in new code on master
fixup! Fix merge conflicts