removed Complement
Added support for type_extension on connection type matching.
Added checking.
Merge remote-tracking branch 'origin/develop' into develop