Merge "Improve type hint"