Begin implementation data resolutions in StateParser
Merge remote-tracking branch 'upstream/collaboration' into nvp
merging upstream/collaboration changes