Merge latest changes on courses to WIP student-dashboard