Update EAK to master
Hack task helpers