Type Hinting improvements
Merge branch 'type_hints' into intergration