Merge branch 'test-mix-tasks' into 'develop'