Merge "Fix package dependencies"