[backfire] merge [20906:20912], [20914:20922] & [20972]