Add test.
Recovery experiment.
Optimization and cleanup.
Refactoring. Move token changes update to more appropriate place.
Work on recovery.
Work on recovery.
Add test.
Merge branch 'master' into RecoveryParserExperiment2
Fix NTR-44.