Merge "Add more type hints in comments for static code analysis"