Merge branch 'stf593' into 'develop'

Final Draft

See merge request !1
2 jobs for develop in 0 seconds (queued for 2 seconds)