[PR] Update handling of network capabilities