[backfire] base-files: backport r28834, r28857, r28864, r28865, r28870, r28871, r28991