Merge "Add ability to set parent at the same time as adding a connection." into oc-dev