Merge "Fix CDM discovery timeout" into main