Merge v3 changes like discovery