Merge branch 'main' into basop-2349-harmonization-of-find_uv-and-find_uv_ivas