Merge branch '2021-07-27_IT101-DM' into 'develop'

2021 07 27 it101 dm

See merge request !108
5 jobs for develop in 5 minutes and 39 seconds (queued for 1 second)