Merge branch 'fix/mix-tasks-userinfo' into 'develop'