Merge branch 'hotfix/130'