Merge "Refactor SubnetConfig"