Merge branch 'main' into add_evs_be_test_to_ci