Merge branch '1618_rpm_spec_fix'