[backfire] merge r21242