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