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