Package controller updates
Merge conflicts