Merge branch 'main' into basop-2334-remove-duplication-of-coder_type_modif_fx