[backfire] merge r24686 and r24688