[backfire] merge r26809, r26810 and r26816