Sort out changes in FIPS and other changes, collected in separate files.