Merge branch 'MDL-55605-lesson-restore-bug' of https://github.com/kenneth-hendricks...