[backfire] merge r27666