Merge "Revert "Add configuration for network capabilities that would be..."" into main