[Ide] Applied type system service patch from mhutch.