Merge "Use full parameter names in the setDiscoveryTechnology API" into main