Merge "Improve type hints in export related classes"