Merge branch 'master' into replicated_tasks

7 jobs for !66 with replicated_tasks
merge request