Merge "Improve TypeProviderImpl.sortTypeDefinitionAccordingDepth()"