hotfix
Merge branch 'hotfix/learning'