Clear current value for non-value tokens
Workaround compiler issue #69867
Update Json unit tests
Update Json unit tests (more tests)