Merge branch 'hotfix/lesson-1-details'