Merge "BUG-650: ResolveDataChangeState.inheritedOne should be a Collection"