Merge branch 'dev' into 'uat'

Dev

See merge request !440
2 jobs for uat in 23 minutes and 58 seconds (queued for 3 seconds)
latest