Merge "Remove prev SBIV parent before attaching to NIC" into main