Merge branch 'main' into basop-2265-fix-opt_2239_ivas_filter_process-macro-definition