Type hinting to be sticter
Merge branch 'master-org' into issue-1637
Merge branch 'master-org' into issue-1637
Merge branch 'master-org' into issue-1637
Merge pull request #1659 from rixbeck/issue-1637

Small alignment on Issue 1637