Merge pull request #1864 from ssushma/dev-branch

Assignment not available text not appearing issue resolved
Decimal numerics entry locked