merging back from master
Handle bad data in FIPS6 field
version
merge dev