Rebase from 'upstream'
add package.xml install rule and remove arch dependent stuff