Merge branch 'hotfix/105'