[backfire] merge r20834, r20840, r20854 & r20855