Merge "Add ability to add existing connection AND set parent at the same time." into oc-dev