Merge branch 'main' into basop-2572-basop-assert-in-evs-encoder-with-fix_2346_duplicated_igf_functions_2