Merge "Remove underlying network caps" into sc-dev