Merge branch 'enc_funcs_fxd_14' into 'main'
Conversion and integration of MASA/OMASA paths sub-functions, cleanup [allow regression] See merge request !655
Conversion and integration of MASA/OMASA paths sub-functions, cleanup [allow regression] See merge request !655