#1351 task changes