Improve connector

Merged Jose Luis Zanotti requested to merge T6834 into 12.0

Merge request reports