Merge branch 'fix/mix-tasks-set-user-info' into 'develop'