BS-937 & BS-2075

Custom connector V5 to V6 migration
- input return type
- output type and return type