Merge "Adjust type hints in htmlform related classes"