Merge branch 'sagnowski-fix-python-type-hints' into 'main'

Fix python type hints not compatible with Python 3.9

See merge request !2245