Merge branch 'issue#57' into 'dev-v4.3.1'

issue #57 Implementation of ENH02.04. from IFA014

See merge request !116
1 job for dev-v4.3.1
in 0 seconds, using 0 compute credits, and was queued for 22 seconds