[backfire] merge r21492, r21556 and r21762