Minor refactoring: reusing union-type from type-sets
Merge branch 'master' into feature/api/predicates