Merge branch 'refactor/network-capability-deployment' into 'refactor/tf-sdk-ports'