Merge branch 'enc_funcs_fxd_10' into 'main'

combined and parametric functions conversion [allow regression]

See merge request !631