[HELIX-336] Add support for task framework, 0.6.x merge