[backfire] merge r21129