AA: base-files: merge r34974 and r34975