#1494 #1510 task changes