[backfire] merge r21823