- refactored resolution of types by label
Merge remote-tracking branch 'origin/master'