[branches] backfire: merge r23284