AA: base-files: backport r36920