Merge "Move the package directory before deleting it." into udc-dev