Merge branch 'develop' into fix/mix-task-logging