Add property typehints for proper IDE support.
Fix ordering
Merge remote-tracking branch 'dongilbert/IDE' into release-2.3.6