Merge branch 'main' into basop-2278-usan-oob-indexing-in-e_gain_closed_loop_search_fx-function-evs