Merge "Fixed SchemaTracker behaviour in choice nodes."