Merge latest changes on enrolment process