Merge branch 'hotfix/#31' into develop