Use import cleanup
Add missing typehint
Merge pull request #3765 from dereuromark/3.0-use-statements

3.0 use statements