Rebase from 'upstream'
Added install rule for package.xml
Removing ~ file