Merge "Fix patch URLs for vCPE use case and other fixes"