Merge branch 'develop' into 'master'

Regular merge of develop

See merge request R3/labCards!1
2 jobs for master in 1 minute and 1 second (queued for 2 seconds)