[backfire] base-files: merge r28612