Fixed list for packages.
Merge branch 'test' into dev