Merge "Bug 1442: Fixed SchemaTracker resolving case children."