Merge with upstream via patches due to package rename