Merge branch 'main' into ivas_basop_issue_2551

# Conflicts:
#	lib_com/options.h
#	lib_enc/cod_tcx_fx.c