Merge "Improve type hints to special page related classes"