Merge "Bug 1303: BindingIndependentConnector splitted."