[backfire] generic-2.6: merge r21073 (#10419)