[backfire] merge r22814, r22815, r22819, r22871, r23084, r23102 and r23171