Fix typehint typo
Add missing use statement
Merge remote-tracking branch 'upstream/master'