Merge pull request #1707 from merico-dev/kw-1706-task-hangs

Kw 1706 task hangs