[backfire] merge r22702, r22703 and r22704