Merge branch 'pkg-fix' into 'master'

skorpyrequested to merge
cherry-pick-53b16b52 into bird

Pkg fix

See merge request !71 (merged)

Merge request reports