[backfire] base-files: backport r29587