Merge "Add a re-parent function to re-parent a specific child."