upstream rebase + packaging maintenance