2321: fix next url after deleting a task
Merge remote-tracking branch 'origin/dev' into dev