Merge "Allowing for null net caps in updateConfiguration"