PLAT-36
and some Task related changes