[backfire] merge r21523, r21871 & r22222