adapt to improved type hints and fix edge case issues with Package-files
#10673
+51
−24
Loading