Merge "NodeConnector custom type"