Merge branch 'fxd_sub_funcs_integration_2' into 'main'

Integration of fixed point sub-functions - 2.

See merge request !219