Commit 3 forTask #884