Merge "Fix issue with wrong user task being resolved" into qt-dev