Commit 4 forTask #884