Update settings with default itree mappings
Fix naming conflict - the field is just called 'type'
Merge remote-tracking branch 'upstream/v1.3' into v1.3