minor
Merge branch 'feature/KORE-convertors' into feature/generic-collection-interfaces