[backfire] merge r23029, r23030, r23031 and r23032