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