Merge "Correct nullability and add extra check for underpinnedNetwork"