Rebase from 'upstream'
added install rule for package.xml
removed some targets, adapted install directory for includes