[backfire] merge r23127