Merge branch 'hotfix/packages' into 'master'

Hotfix/packages

See merge request !3