[backfire] merge r27147