Merge branch 'hotfix/122'