Fix packages
Merge branch 'dev-ced'