backport bundle management from current