Initial recovery commit from Dinova/Studiekoll