Merge branch 'fix/user-list-task' into 'develop'