Merge branch 'hotfix/131'