[backfire] merge r27646