Merge branch 'main' into basop-2499-harmonize-configurefdcngdec_fx