kept in sync with hz-task changes