Fix resources path
Merge branch 'hotfix/fix-resources'
Merge branch 'master' into package/ubuntu
Update changelog