[backfire] merge r23253, r23254 and r23255