[backfire] merge r21638