Additional files in unified RPM for #4375 and #4569