Rebase from 'upstream'
Adding install rule for package.xml