Update from fips2 branch.