Draft: Remerge improve code based on mypy outputt

Hans Fangohrrequested to merge
remerge-improve-code-based-on-mypy-outputt into main

Second attempt to merge main into !10 (merged)

Merge request reports