Merge pull request #1884 from ssushma/dev-branch

Numeric fields issue resolved
unit setup header consistency implemented.