Merge branch 'tmf-674-feature' into 'develop'

Tmf 674 feature

See merge request !24
2 jobs for fix#38
in 1 minute and 59 seconds, using 0 compute credits, and was queued for 3 seconds