[backfire] merge r23256, r23257 and r23258