Merge branch 'hotfix-issue-16' into dev