Merge branch 'main' into VA_basop_no_glob_extrem_saturation_part2