[backfire] base-files, target: merge r28750 and r28933