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

Tmf 674 feature

See merge request !8
1 job for develop
in 40 seconds, using 0 compute credits, and was queued for 1 second