IndexName, ClusterName & ConnectorName use extended in Statements
Merge with local branch