Merge "Remove underlying network caps"