Additional files in unified RPM for #4375 and #4569
Merge branch 'V8_3_2-branch'