Merge "Language: Use type hint instead of manual type check"