changes from upstream
changes to package.xml