[backfire] merge r22279 and r22282 (#6011)