Merge branch 'main' into VA_basop_no_glob_hi_level