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