Merge of CONNECTORS-1754 branch