Merge latest changes on QIP student-dashboard to courses